Drop gdkintl.h

This header was merely including gi18n-lib.h.
Just do that directly.

diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c
index 9c9e2eda79cb2fb0ae3f004356b3f8da63284885..79b4059facc300821098cf72d8652964127f40d4 100644 (file)
--- a/gdk/broadway/gdkbroadway-server.c
+++ b/gdk/broadway/gdkbroadway-server.c
@@ -34,7 +34,7 @@
 #ifdef G_OS_WIN32
 #include <windows.h>
 #endif
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 typedef struct BroadwayInput BroadwayInput;
 

diff --git a/gdk/gdk.c b/gdk/gdk.c
index c6371b724fff82ee60d720c885e0843484b20f32..e6a1ebb51e25cb6ab0d77e59ccd5ff48a047a666 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -32,7 +32,7 @@
 #include "gdkdebugprivate.h"
 #include "gdkdisplay.h"
 #include "gdkglcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 #include <glib/gprintf.h>
 

diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 17e5acc4f7f62edac1ff8be8a2471f6fa06e3f0f..bf70c5f036c337c5dfd790cbdca82b3a5e2c811f 100644 (file)
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -22,7 +22,7 @@
 
 #include "gdkapplaunchcontextprivate.h"
 #include "gdkdisplay.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 
 /**

diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index e6174c83c42466c57ff78a36b71c38f2c8723f5f..349b9937404c4a0e006f0c44b908326f65ad2803 100644 (file)
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -26,7 +26,7 @@
 #include "gdkcontentproviderprivate.h"
 #include "gdkcontentserializer.h"
 #include "gdkdisplay.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkpipeiostreamprivate.h"
 #include "gdktexture.h"
 #include "gdkprivate.h"

diff --git a/gdk/gdkcontentprovider.c b/gdk/gdkcontentprovider.c
index 4f1c356226bec927dffcd39a1fd76bb036fe8978..8127eec66c55fd2755a558f26521c4522c627629 100644 (file)
--- a/gdk/gdkcontentprovider.c
+++ b/gdk/gdkcontentprovider.c
@@ -22,7 +22,7 @@
 
 #include "gdkclipboard.h"
 #include "gdkcontentformats.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 
 /**

diff --git a/gdk/gdkcontentproviderimpl.c b/gdk/gdkcontentproviderimpl.c
index d11601823cf418f156d15ca7667d831fe84c4fb0..8984f8e5e03b10534245b9521dba0458da6090d4 100644 (file)
--- a/gdk/gdkcontentproviderimpl.c
+++ b/gdk/gdkcontentproviderimpl.c
@@ -24,7 +24,7 @@
 
 #include "gdkcontentformats.h"
 #include "gdkcontentserializer.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkcontentproviderimpl.h"
 
 #include "gdkprivate.h"

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 43f6dad5db05fbfe1fa33417d6edeb85e696b4b0..f73bcaf017b453db032ad6a1a7c1480f956641be 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -30,7 +30,7 @@
 #include "gdkcursor.h"
 #include "gdkcursorprivate.h"
 #include "gdktexture.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <math.h>
 #include <errno.h>

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index c4473852c4db510c61a5c9cf9f50668c0f12428c..95b5505903c9a245dfd0dd11ce0736867549ab07 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -22,7 +22,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetool.h"
 #include "gdkdisplayprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkkeysprivate.h"
 
 /**

diff --git a/gdk/gdkdevicetool.c b/gdk/gdkdevicetool.c
index 97993122a8f9759bdc8b8914ef9550f4f15f661c..e112926e5974080f794b6bf4402f66c042a392f5 100644 (file)
--- a/gdk/gdkdevicetool.c
+++ b/gdk/gdkdevicetool.c
@@ -21,7 +21,7 @@
 
 #include "gdkdevicetoolprivate.h"
 #include "gdkenumtypes.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkDeviceTool:

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 6b2f0b720ac06c42b1c42a16c0bab2920268697f..462a0eee731901d0a880e22a3ab2228afa80642b 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -24,7 +24,7 @@
 #include "gdkdisplay.h"
 #include "gdkdisplayprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 
 #include "gdkapplaunchcontext.h"

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index cac1e9dca4fafaba64b8532e64b9a77624298117..4ac6a0db2d3c5d1b848257e07d29e499a8ad1b62 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -28,7 +28,7 @@
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkkeysprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"

diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c
index 62bd7455f50ae93e0dd852b6b66f986cddd9b3fc..37ba3880377f0a1772f5d6e692b93a97af748ef5 100644 (file)
--- a/gdk/gdkdrag.c
+++ b/gdk/gdkdrag.c
@@ -42,7 +42,7 @@
 #include "gdkdragprivate.h"
 #include "gdkdisplay.h"
 #include "gdksurface.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkcontentformats.h"
 #include "gdkcontentprovider.h"
 #include "gdkcontentserializer.h"

diff --git a/gdk/gdkdragsurface.c b/gdk/gdkdragsurface.c
index e00be8c2caa22b7d2b2c47869c2ecdfbba204487..97c3e7dd36ac92922760a7f18ff2470776ed5b76 100644 (file)
--- a/gdk/gdkdragsurface.c
+++ b/gdk/gdkdragsurface.c
@@ -21,7 +21,7 @@
 
 #include "gdkprivate.h"
 #include "gdkdragsurfaceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkDragSurface:

diff --git a/gdk/gdkdrawcontext.c b/gdk/gdkdrawcontext.c
index 6751407e0da0f13d0dfb7cd6d2e336af2977cd64..8699807cab4b587bfc006675fb2b889ea3f6385c 100644 (file)
--- a/gdk/gdkdrawcontext.c
+++ b/gdk/gdkdrawcontext.c
@@ -23,7 +23,7 @@
 #include "gdkdrawcontextprivate.h"
 
 #include "gdkdebugprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprofilerprivate.h"
 #include "gdksurfaceprivate.h"
 

diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index f1c7c0f5985cac5f0b03abc1f6410743a7049086..afc51aeda2ec561e87bd2869fa596438143bc8a9 100644 (file)
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -49,7 +49,7 @@
 #include "gdkdragprivate.h"
 #include "gdkenumtypes.h"
 #include "gdkeventsprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkpipeiostreamprivate.h"
 #include "gdksurface.h"
 

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 627da7373bb17527a48685f7c471cbf70bfdc1e1..3e68b26579bfbb355c7ae6ac57d8a758403b662b 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -28,7 +28,7 @@
 #include "gdkdragprivate.h"
 #include "gdkdropprivate.h"
 #include "gdkeventsprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkprivate.h"

diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index e44a192ccd7d1947bb12ef1b2f31401ae2b6c91e..040b9cce1aa38306dcf793e89c5025ad53484534 100644 (file)
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -78,7 +78,7 @@
 
 #include "gdkdebugprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"

diff --git a/gdk/gdkintl.h b/gdk/gdkintl.h
deleted file mode 100644 (file)
index 69a9fd9..0000000
--- a/gdk/gdkintl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDKINTL_H__
-#define __GDKINTL_H__
-
-#include <glib/gi18n-lib.h>
-
-#endif

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 4da170baeab92c2f4df2823758955361ff6d3840..3bbeac1cc2bfef894adaf162dd767adaeef1aec4 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -19,7 +19,7 @@
 
 #include "gdkpango.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <math.h>
 #include <pango/pangocairo.h>

diff --git a/gdk/gdkpopup.c b/gdk/gdkpopup.c
index 8388078086970c2cde2e548a817f2d860189335f..99dcbaa66e53f4b09db999a12200ab3cf1b3fd28 100644 (file)
--- a/gdk/gdkpopup.c
+++ b/gdk/gdkpopup.c
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "gdkprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkpopupprivate.h"
 
 /**

diff --git a/gdk/gdkseat.c b/gdk/gdkseat.c
index fd9385f5357b83fd806dc43cc6e4313a923c3e94..e9f7f08c7fd28c13a5aba895eba0dc357014361e 100644 (file)
--- a/gdk/gdkseat.c
+++ b/gdk/gdkseat.c
@@ -25,7 +25,7 @@
 #include "gdkdevicetoolprivate.h"
 #include "gdkseatprivate.h"
 #include "gdkdeviceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkSeat:

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 277ec59513f21a61d8a1b59f298e84ba2e3a14ef..7fc0d5e37fa478b4cf440cc7bbe136e6d1612cf0 100644 (file)
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -37,7 +37,7 @@
 #include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
 #include "gdkglcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmarshalers.h"
 #include "gdkpopupprivate.h"
 #include "gdkrectangle.h"

diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index ef7123c94a25acbe9af09587ae5f88fe1073e4ae..3c4bf10634ace03f65c5ff8ae2a8f335243ee0ac 100644 (file)
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -39,7 +39,7 @@
 
 #include "gdktextureprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemorytextureprivate.h"
 #include "gdkpaintable.h"
 #include "gdksnapshot.h"

diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c
index 5e5ce4aa507a1674717fef4daa354b130ecfa056..340dba3cf7c5e08c5f788736bd1db41dca8b1509 100644 (file)
--- a/gdk/gdktoplevel.c
+++ b/gdk/gdktoplevel.c
@@ -23,7 +23,7 @@
 
 #include "gdkdisplay.h"
 #include "gdkenumtypes.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 
 #include <graphene-gobject.h>

diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index c5756dc19870c82cde31832e8bf0723a5ca0f43f..70450f2334aeb4bf222585cce94ed0142b598767 100644 (file)
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -25,7 +25,7 @@
 #include "gdkvulkancontextprivate.h"
 
 #include "gdkdisplayprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkVulkanContext:

diff --git a/gdk/loaders/gdkjpeg.c b/gdk/loaders/gdkjpeg.c
index c715841940946ca2907c19919ba4b4a0b7e004b2..ba6731ac1112dbe7574167d1b4cb5e0eef417d1e 100644 (file)
--- a/gdk/loaders/gdkjpeg.c
+++ b/gdk/loaders/gdkjpeg.c
@@ -21,7 +21,7 @@
 
 #include "gdkjpegprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdktexture.h"
 #include "gdkmemorytextureprivate.h"
 

diff --git a/gdk/loaders/gdkpng.c b/gdk/loaders/gdkpng.c
index c049868caf0427eb5169b5cf36989f5c7e422ed3..3d4172f9edb0ad73159493f9acbc2f259f64a973 100644 (file)
--- a/gdk/loaders/gdkpng.c
+++ b/gdk/loaders/gdkpng.c
@@ -19,7 +19,7 @@
 
 #include "gdkpngprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"

diff --git a/gdk/loaders/gdktiff.c b/gdk/loaders/gdktiff.c
index 724e4c3a8104d5a2ba3a8d8de7c0771287ac1105..eab69bb2d9e005d2b99ec656699e5cf77d90b7a5 100644 (file)
--- a/gdk/loaders/gdktiff.c
+++ b/gdk/loaders/gdktiff.c
@@ -19,7 +19,7 @@
 
 #include "gdktiffprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"

diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c
index 210867eb59e1dd73013c985ff943d1e52e385877..b7d97267989572b825f8eb0c95d75f6bdd31df4e 100644 (file)
--- a/gdk/macos/gdkmacosdrag.c
+++ b/gdk/macos/gdkmacosdrag.c
@@ -28,7 +28,7 @@
 
 #include "gdk/gdkdeviceprivate.h"
 #include "gdk/gdkeventsprivate.h"
-#include "gdk/gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdk/gdkseatprivate.h"
 #include "gdk/gdkprivate.h"
 

diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
index ed3c4772b1b7193059949733961ed9f00fda53f5..cc4914867abf20ff616a9cb04121440d1eb41bdf 100644 (file)
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
@@ -26,7 +26,7 @@
 #include "gdkwayland.h"
 #include "gdkprivate-wayland.h"
 #include "gdkapplaunchcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 typedef struct {
   gchar *token;

diff --git a/gdk/wayland/gdkclipboard-wayland.c b/gdk/wayland/gdkclipboard-wayland.c
index 1fce61f8a7659f8e547cd5227e69d5434787db1f..541a13e687eabd05cf312f36802fd7f2bfb39d2b 100644 (file)
--- a/gdk/wayland/gdkclipboard-wayland.c
+++ b/gdk/wayland/gdkclipboard-wayland.c
@@ -21,7 +21,7 @@
 #include "gdkclipboard-wayland.h"
 
 #include "gdkcontentformats.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-wayland.h"
 #include "gdkprivate.h"
 

diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c
index b00769e907d3c64980676de7bb8dd8ca6b8ce150..297225e97a24632b3d9ae7cc436c4e5708be24a0 100644 (file)
--- a/gdk/wayland/gdkdrag-wayland.c
+++ b/gdk/wayland/gdkdrag-wayland.c
@@ -22,7 +22,7 @@
 #include "gdkprivate-wayland.h"
 #include "gdkcontentformats.h"
 #include "gdkdisplay-wayland.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkseat-wayland.h"
 
 #include "gdkdeviceprivate.h"

diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c
index c1391ba080c7df99c4f18a6c7543725ea34a983b..10b6271cddd06b19b6b631be6728c346b3d1f0ff 100644 (file)
--- a/gdk/wayland/gdkdrop-wayland.c
+++ b/gdk/wayland/gdkdrop-wayland.c
@@ -22,7 +22,7 @@
 #include "gdkprivate-wayland.h"
 #include "gdkcontentformats.h"
 #include "gdkdisplay-wayland.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkseat-wayland.h"
 
 #include "gdkdeviceprivate.h"

diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index 745e841f1affbc2e3edc109da0a91de70c0025bf..e7341d4fe68e182023ee3a08dc065a0844f8f0fa 100644 (file)
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -35,7 +35,7 @@
 #include "gdksurfaceprivate.h"
 #include "gdkprofilerprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkWaylandGLContext:

diff --git a/gdk/wayland/gdkprimary-wayland.c b/gdk/wayland/gdkprimary-wayland.c
index 2c5aaa05ff811ce39b64d37088fbf69c4d5ebaa0..6cef2f3968d05cac04f1951b1516d41694f1d9ea 100644 (file)
--- a/gdk/wayland/gdkprimary-wayland.c
+++ b/gdk/wayland/gdkprimary-wayland.c
@@ -21,7 +21,7 @@
 
 #include "gdkclipboardprivate.h"
 #include "gdkcontentformats.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-wayland.h"
 #include "gdkprivate.h"
 

diff --git a/gdk/win32/gdkclipboard-win32.c b/gdk/win32/gdkclipboard-win32.c
index 58be9680a2a33a977fe5c7e186b90bdfe84e3093..f6b21d422fbda989913d109f55f85166b5111850 100644 (file)
--- a/gdk/win32/gdkclipboard-win32.c
+++ b/gdk/win32/gdkclipboard-win32.c
@@ -21,7 +21,7 @@
 #include "gdkclipboard-win32.h"
 
 #include "gdkdebugprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-win32.h"
 #include "gdkhdataoutputstream-win32.h"
 #include "gdk/gdkprivate.h"

diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c
index 6792cc400455b0a6f83ec7b71196e7ce63a6d723..57ade2180d1ee0f57f7f5dc808145e4e648a6e36 100644 (file)
--- a/gdk/win32/gdkclipdrop-win32.c
+++ b/gdk/win32/gdkclipdrop-win32.c
@@ -286,7 +286,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
 
 #include "gdk/gdkdebugprivate.h"
 #include "gdk/gdkdragprivate.h"
-#include "gdk/gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdk/gdkprivate.h"
 
 #define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0])

diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index 80d3c67f3ea94924e16f4e56cadaaca75c29846f..5feba04e510896413f3af62f4c13dda36522fd86 100644 (file)
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -22,7 +22,7 @@
 #include "gdkcursor.h"
 #include "gdkwin32.h"
 #include "gdktextureprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include "gdkdisplay-win32.h"
 

diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index a7bda515d9058e9631e1ee0c8a7ca45c74b7ea47..d3fd992b134c39ce895d5295fc0dbfb9043b444b 100644 (file)
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -214,7 +214,7 @@
 #include <shlobj.h>
 #include <shlguid.h>
 #include <objidl.h>
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <gdk/gdk.h>
 #include <glib/gstdio.h>

diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index ade23b7a71880016b395d7711eb5982ecddab6d0..2b500431e25dfd5b975a7d4a0cc6de08e07cc605 100644 (file)
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -56,7 +56,7 @@
 #include <shlobj.h>
 #include <shlguid.h>
 #include <objidl.h>
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <gdk/gdk.h>
 #include <glib/gstdio.h>

diff --git a/gdk/win32/gdkglcontext-win32-egl.c b/gdk/win32/gdkglcontext-win32-egl.c
index e953bd9e1353a6ac080444245dfc374756d2cb03..0e8854de498ecb09aeb336eb53966025e927152a 100644 (file)
--- a/gdk/win32/gdkglcontext-win32-egl.c
+++ b/gdk/win32/gdkglcontext-win32-egl.c
@@ -35,7 +35,7 @@
 
 #include "gdkglcontext.h"
 #include "gdksurface.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo.h>
 #include <epoxy/egl.h>

diff --git a/gdk/win32/gdkglcontext-win32-wgl.c b/gdk/win32/gdkglcontext-win32-wgl.c
index 4fe04828ffb5c3a58cb8f097f922f079d0fc746a..f15d64d34b9f086a68fcbd672ae9ec1b3536f6a1 100644 (file)
--- a/gdk/win32/gdkglcontext-win32-wgl.c
+++ b/gdk/win32/gdkglcontext-win32-wgl.c
@@ -35,7 +35,7 @@
 
 #include "gdkglcontext.h"
 #include "gdkprofilerprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdksurface.h"
 
 #include <cairo.h>

diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c
index c1126318ca8bc1f2617a6c2f2c04e1137ccf36ba..3fd8aa25d646ca7e0a5fca7cf7c83ec6847ecc81 100644 (file)
--- a/gdk/win32/gdkglcontext-win32.c
+++ b/gdk/win32/gdkglcontext-win32.c
@@ -35,7 +35,7 @@
 
 #include "gdkglcontext.h"
 #include "gdksurface.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo.h>
 #include <epoxy/wgl.h>

diff --git a/gdk/win32/gdkhdataoutputstream-win32.c b/gdk/win32/gdkhdataoutputstream-win32.c
index 7fead7243d0352af29634104e5f199138508f025..b1c668f01a08960c1f237bbe5dc96b8e473509c8 100644 (file)
--- a/gdk/win32/gdkhdataoutputstream-win32.c
+++ b/gdk/win32/gdkhdataoutputstream-win32.c
@@ -27,7 +27,7 @@
 
 #include "gdkclipboard-win32.h"
 #include "gdkdisplay-win32.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkwin32display.h"
 #include "gdkwin32surface.h"
 

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 1854873fbc0447efc5be3004b5d092d8fee32f59..c388a0778dbfbfc1127ad7898d5e476a89f95172 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -34,7 +34,7 @@
 #include "gdk.h"
 #include "gdkdebugprivate.h"
 #include "gdkkeysyms.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-win32.h"
 #include "gdkinput-dmanipulation.h"
 #include "gdkwin32.h"

diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index add9bc963ca2c05875a9a1e2705ef1573a8948e2..4284d182cd135d861f8359524239fb6a7babfbf1 100644 (file)
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -22,7 +22,7 @@
 
 #include "gdkx11applaunchcontext.h"
 #include "gdkapplaunchcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate.h"

diff --git a/gdk/x11/gdkclipboard-x11.c b/gdk/x11/gdkclipboard-x11.c
index 02047e265e6bd6b3824dcb27f346a63b791c16d0..aa9cdbcfaaa9b9e4db6336dc628a68489f5db892 100644 (file)
--- a/gdk/x11/gdkclipboard-x11.c
+++ b/gdk/x11/gdkclipboard-x11.c
@@ -20,7 +20,7 @@
 #include "gdkclipboardprivate.h"
 #include "gdkclipboard-x11.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkselectioninputstream-x11.h"

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 426c14fd0f5e562ff4684a0ee94d1702fc64ee9c..4392e078d3454f18b48b93b2bc1eb3ff67a0579b 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -21,7 +21,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevice-xi2-private.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkasync.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index c8b8452507d04fbdee840197a154b79c012f9289..566d519809fd3c217a0e997fb238e1067e674e8c 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -28,7 +28,7 @@
 #include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkkeysyms.h"
 #include "gdkseatdefaultprivate.h"
 

diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 2b82ea4978759530622d12ac381a760db716f753..9ed967e88678eb26a881a0fd619c92faa743f552 100644 (file)
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -36,7 +36,7 @@
 #include "gdkdragprivate.h"
 #include "gdkeventsprivate.h"
 #include "gdksurfaceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkseatprivate.h"

diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index c41301065e470fe5c79d1c91383975bcadc8425d..68c8cb936af61e19f9c7aaa09a3ef59da9896596 100644 (file)
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -33,7 +33,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay-x11.h"
 #include "gdkdragprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkselectioninputstream-x11.h"

diff --git a/gdk/x11/gdkglcontext-egl.c b/gdk/x11/gdkglcontext-egl.c
index 6a6bf9a08b448a426600e3a66b5fbb3171f46034..2655ffa503375356811d5ab2312c1c46abc0c0fc 100644 (file)
--- a/gdk/x11/gdkglcontext-egl.c
+++ b/gdk/x11/gdkglcontext-egl.c
@@ -22,7 +22,7 @@
 #include <X11/Xatom.h>
 
 #include "gdkprofilerprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo-xlib.h>
 

diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c
index 717426cf68926d50c5a882a16f5f2f654c0b063f..42f9d0c28657ba2c909a2ce5c357c3e404b411d1 100644 (file)
--- a/gdk/x11/gdkglcontext-glx.c
+++ b/gdk/x11/gdkglcontext-glx.c
@@ -23,7 +23,7 @@
 #include <X11/Xatom.h>
 
 #include "gdkprofilerprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo-xlib.h>
 

diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 567ae8900214bf830cfe51b9593e7d8f5afe529d..d225b79b7c544b0a6d771329d1db548260af594d 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -31,7 +31,7 @@
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo-xlib.h>
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index c92e3858fe575ed32357cadd0786ed9975a087ee..4c291a9068974df8ee1286dd4d4c17d8c1018da5 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "gdkdeviceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkasync.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"

diff --git a/gdk/x11/gdkselectioninputstream-x11.c b/gdk/x11/gdkselectioninputstream-x11.c
index 2f2ed7d6e85b5d1f6d79d6ca26ece0bf28c6c439..e6bc574409ab6788c3a64f08741f69eb5430acfd 100644 (file)
--- a/gdk/x11/gdkselectioninputstream-x11.c
+++ b/gdk/x11/gdkselectioninputstream-x11.c
@@ -24,7 +24,7 @@
 #include "gdkselectioninputstream-x11.h"
 
 #include "gdkdisplay-x11.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkx11display.h"
 #include "gdkx11property.h"
 #include "gdkx11surface.h"

diff --git a/gdk/x11/gdkselectionoutputstream-x11.c b/gdk/x11/gdkselectionoutputstream-x11.c
index d81d995fc9a35d863369166883766ed1551055d6..c489b2b46b8e79125a0e48976ca22bb53d212c45 100644 (file)
--- a/gdk/x11/gdkselectionoutputstream-x11.c
+++ b/gdk/x11/gdkselectionoutputstream-x11.c
@@ -25,7 +25,7 @@
 
 #include "gdkclipboard-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdktextlistconverter-x11.h"
 #include "gdkx11display.h"
 #include "gdkx11property.h"

diff --git a/gdk/x11/gdktextlistconverter-x11.c b/gdk/x11/gdktextlistconverter-x11.c
index c8f7a0276f0cc1a5e5955268ec1b69d0527c7c84..10b710b1df8526df767ae8bb61165bc1e8347300 100644 (file)
--- a/gdk/x11/gdktextlistconverter-x11.c
+++ b/gdk/x11/gdktextlistconverter-x11.c
@@ -22,7 +22,7 @@
 
 #include "gdktextlistconverter-x11.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 
 #define GDK_X11_TEXT_LIST_CONVERTER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_X11_TEXT_LIST_CONVERTER, GdkX11TextListConverterClass))

diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 67cc924cda6523d75bb316fd93950ba70a3f4786..9ed6a655bcf84acff7d49f44a1fe4700fcb20386 100644 (file)
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -24,7 +24,7 @@
 #include <gdk/gdkdisplayprivate.h>
 #include <gdk/gdkglcontextprivate.h>
 #include <gdk/gdksurfaceprivate.h>
-#include <gdk/gdkintl.h>
+#include <glib/gi18n-lib.h>
 #include <gsk/gskdebugprivate.h>
 #include <gsk/gskrendererprivate.h>
 #include <gsk/gskrendernodeprivate.h>